Remove Mac-specific hack that was required for building gui in

Qt 4.8.[45] but fixed in 5.2.1.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4757 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index 3fcfbe929f0b9378bbb40499667ad2c624e93809..71f0661b62962c4412f9ab0adab64e6d924db04e 100644 (file)
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -382,7 +382,7 @@ mac-release:
        curl -u anonymous:anonymous --upload-file gpsbabel-osx.tgz ftp://upload.sf.net/incoming/
 
 gui: gpsbabel
-       cd gui ; $(QMAKE) -spec macx-g++ app.pro && make
+       cd gui ; $(QMAKE) app.pro && make
        cd gui ; $(LUPDATE) app.pro
        cd gui ; $(LRELEASE) app.pro
 

diff --git a/gpsbabel/gui/gpsbabel.ts b/gpsbabel/gui/gpsbabel.ts
index 510ebb278bfa49a80212d2827269ad1d70e4599d..2fcd285b1c97e4bde20921e8ed41c23b31c60d5e 100644 (file)
--- a/gpsbabel/gui/gpsbabel.ts
+++ b/gpsbabel/gui/gpsbabel.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name></name>
     <message>

diff --git a/gpsbabel/gui/gpsbabelfe.ts b/gpsbabel/gui/gpsbabelfe.ts
index a1088daf2c0d7571d33b348866a757231bef1614..0657da5f7b99cf19d6e6a04afad6717377e19c28 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe.ts
+++ b/gpsbabel/gui/gpsbabelfe.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
 <context>
     <name>AboutDlg</name>
     <message>

diff --git a/gpsbabel/gui/gpsbabelfe_de.ts b/gpsbabel/gui/gpsbabelfe_de.ts
index 3d0cca9f3e6e7bd5c2655ddfaef7dafdf6a6ac49..750cb3a9c04b77de7838b19fc0a68e2ca9d75f1c 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe_de.ts
+++ b/gpsbabel/gui/gpsbabelfe_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name>AboutDlg</name>
     <message>

diff --git a/gpsbabel/gui/gpsbabelfe_es.ts b/gpsbabel/gui/gpsbabelfe_es.ts
index 0d746ca8dc1ef19effe99ea6301d4af64ff4fa65..fcf80d45b3f6c9238976be8d3f8379a0fa6cedee 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe_es.ts
+++ b/gpsbabel/gui/gpsbabelfe_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<TS version="2.1" language="es_ES">
 <context>
     <name>AboutDlg</name>
     <message>

diff --git a/gpsbabel/gui/gpsbabelfe_fr.ts b/gpsbabel/gui/gpsbabelfe_fr.ts
index f2bc715a46241d8c17dcd74dd742e9562cb30ce9..5a263553bc339f343a75c9745a10e498b07e1af7 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe_fr.ts
+++ b/gpsbabel/gui/gpsbabelfe_fr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<TS version="2.1" language="fr_FR">
 <context>
     <name>AboutDlg</name>
     <message>

diff --git a/gpsbabel/gui/gpsbabelfe_hu.ts b/gpsbabel/gui/gpsbabelfe_hu.ts
index 261d9492215005461dcbcb25b3e778648d7a9214..4cd4c7288e4ec7077cb644425b3b3b53c6cb2a66 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe_hu.ts
+++ b/gpsbabel/gui/gpsbabelfe_hu.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="hu_HU">
+<TS version="2.1" language="hu_HU">
 <context>
     <name>AboutDlg</name>
     <message>

diff --git a/gpsbabel/gui/gpsbabelfe_it.ts b/gpsbabel/gui/gpsbabelfe_it.ts
index 12d399b90462a41763d9b8a80a756c545ce52aae..193e3f0617ac4e9e27cac4160754ebf19ea8e1ce 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe_it.ts
+++ b/gpsbabel/gui/gpsbabelfe_it.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en_US">
+<TS version="2.1" language="en_US">
 <context>
     <name>AboutDlg</name>
     <message>

diff --git a/gpsbabel/gui/gpsbabelfe_ru.ts b/gpsbabel/gui/gpsbabelfe_ru.ts
index ab738259048f7cbac9962aa60aa324c11338f127..c0b8f57d91704f2c8c1cf3f7a545fb123f1b832f 100644 (file)
--- a/gpsbabel/gui/gpsbabelfe_ru.ts
+++ b/gpsbabel/gui/gpsbabelfe_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU" sourcelanguage="ru_RU">
+<TS version="2.1" language="ru_RU" sourcelanguage="ru_RU">
 <context>
     <name>AboutDlg</name>
     <message>

diff --git a/gpsbabel/tools/mac-localize b/gpsbabel/tools/mac-localize
index 5cf319af28e60975546f40ce9ffbef5a0c752236..923921b3d93bcd6ceb79b93ea346e8e8cdb45647 100755 (executable)
--- a/gpsbabel/tools/mac-localize
+++ b/gpsbabel/tools/mac-localize
@@ -12,7 +12,7 @@ mkplist() {
   [ ! -d $D ] && mkdir $D
   sed "s/LANGUAGE/$1/" ../tools/skeleton-locversion-plist > $D/locversion.plist
   # optional as en, it, and hu aren't translated in Qt yet.
-  [ ! -f "$QTDIR/qt_$1.qm" ]  && echo "Bad QTDIR"
+  [ ! -f "$QTDIR/qt_$1.qm" ]  && echo "Bad QTDIR for $1"
   cp "$QTDIR/qt_$1.qm" $LANGDIR
   [ -f gpsbabelfe_${1}.qm ] && cp gpsbabelfe_${1}.qm  $LANGDIR
 }